68. Araxis Merge File Comparison Report

Produced by Araxis Merge on Fri Dec 13 16:40:55 2019 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

68.1 Files compared

# Location File Last Modified
1 Fri Dec 13 16:40:55 2019 UTC
2 Porto v.3.2.2\Theme Files\Magento 1.x\Porto Theme\app\design\frontend\smartwave\porto\template\page\html header_type25.phtml Mon Nov 25 12:52:36 2019 UTC

68.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 0 0
Changed 0 0
Inserted 1 39
Removed 0 0

68.3 Comparison options

Whitespace All differences in whitespace within lines are ignored
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Not shown in the comparison detail

68.4 Active regular expressions

No regular expressions were active.

68.5 Comparison detail

        1   <?php
        2       $store  = Mage::a pp()->getS tore();
        3       $code   = $store- >getCode() ;
        4       $custo m_block =  Mage::getS toreConfig ('porto_se ttings/hea der/static _block', $ code);
        5   ?>
        6   <div class ="header-c ontainer t ype25 head er-newskin ">
        7       <div c lass="head er contain er">
        8           <? php echo $ this->getC hildHtml(' topMenu')  ?>
        9           <d iv class=" menu-icon" ><a href=" javascript :void(0)"  title="<?p hp echo $t his->__('M enu'); ?>" ><i class= "fa fa-bar s"></i></a ></div>
        10           <? php if ($t his->getIs HomePage() ):?>
        11           <h 1 class="l ogo"><stro ng><?php e cho $this- >getLogoAl t(); ?></s trong><a h ref="<?php  echo $thi s->getUrl( ''); ?>" t itle="<?ph p echo $th is->getLog oAlt(); ?> " class="l ogo"><img  src="<?php  echo $thi s->getLogo Src(); ?>"  alt="<?ph p echo $th is->getLog oAlt(); ?> " /></a></ h1>
        12           <? php else:? >
        13           <a  href="<?p hp echo $t his->getUr l(''); ?>"  title="<? php echo $ this->getL ogoAlt();  ?>" class= "logo"><st rong><?php  echo $thi s->getLogo Alt(); ?>< /strong><i mg src="<? php echo $ this->getL ogoSrc();  ?>" alt="< ?php echo  $this->get LogoAlt();  ?>" /></a >
        14           <? php endif;  ?>
        15           <d iv class=" header-mai n-right">
        16                <div cla ss="switch ers">
        17                    <?ph p
        18                    $sto re_currenc y = $this- >getChildH tml('store _currency' );
        19                    $sto re_languag e = $this- >getChildH tml('store _language' );
        20                    ?>
        21                    <?ph p echo $st ore_curren cy; ?>
        22                    <?ph p echo $st ore_langua ge; ?>
        23                </div>
        24                <div cla ss="top-li nks-area">
        25                    <div  class="to p-links-ic on"><a hre f="javascr ipt:void(0 )"><i clas s="porto-n ew-icon-us er-2"></i> </a></div>
        26                    <?ph p echo $th is->getChi ldHtml('to pLinks');  ?>
        27                </div>
        28                <div cla ss="search -area">
        29                    <a h ref="javas cript:void (0);" clas s="search- icon"><i c lass="icon -magnifier "></i><spa n><?php ec ho $this-> __('Search '); ?></a>
        30                    <?ph p echo $th is->getChi ldHtml('to pSearch');  ?>
        31                </div>
        32                <div cla ss="wishli st-link">
        33                    <a h ref="<?php  echo $thi s->getUrl( 'wishlist' ); ?>" tit le="<?php  echo $this ->__('Wish list'); ?> "><i class ="porto-ne w-icon-wis hlist-2">< /i></a>
        34                </div>
        35                <?php ec ho $this-> getChildHt ml('minica rt'); ?>
        36           </ div>
        37       </div>
        38   </div>
        39   <?php echo  $this->ge tChildHtml ('mobile.n av') ?>